Misc fixes for new sparse tree names: xen-clone script; -xen kernel build (the one...

Signed-off-by: ian.pratt@cl.cam.ac.uk

diff --git a/Makefile b/Makefile
index 2bc4c997aecf43eb7f42a053e3ccfc51397828a2..5545aa4977b81a3d06c26de556d6dfcc0b0e7d37 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -181,10 +181,10 @@ uninstall:
 
 # Legacy targets for compatibility
 linux24:
-       $(MAKE) 'KERNELS=linux-2.4-xen0 linux-2.4-xenU' kernels
+       $(MAKE) 'KERNELS=linux-2.4*' kernels
 
 linux26:
-       $(MAKE) 'KERNELS=linux-2.6-xen0 linux-2.6-xenU' kernels
+       $(MAKE) 'KERNELS=linux-2.6*' kernels
 
 netbsd20:
        $(MAKE) netbsd-2.0-xenU-build

diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen
index 23f8583782aa3e9271edf800550de99dfc96a31e..310dc27c28d8f310b364c7c3e91169622e431d41 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen
+++ b/buildconfigs/mk.linux-2.6-xen
@@ -2,6 +2,7 @@
 OS           = linux
 
 LINUX_SERIES = 2.6
+LINUX_VER    = 2.6.12
 
 EXTRAVERSION = xen
 
@@ -23,7 +24,7 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
        rm -rf $(LINUX_DIR)
        cp -al $(<D) $(LINUX_DIR)
        # Apply arch-xen patches
-       ( cd linux-$(LINUX_VER)-xen-sparse ; \
+       ( cd linux-$(LINUX_SERIES)-xen-sparse ; \
           ./mkbuildtree ../$(LINUX_DIR) )
        # Re-use config from install dir if one exits else use default config
        CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \

diff --git a/tools/misc/xen-clone b/tools/misc/xen-clone
index 581a0b9f4e978d271d86ed90d72b7ca4998a0925..2d0bea66ae85397723dcd620b77c2c01c3a4a85d 100755 (executable)
--- a/tools/misc/xen-clone
+++ b/tools/misc/xen-clone
@@ -60,7 +60,7 @@ cd ${TOP}
 fi
 
 
-if [ -d ${DEST_BK_REP}/linux-2.4.*-xen-sparse ]
+if [ -d ${DEST_BK_REP}/linux-2.4*-xen-sparse ]
 then
  # this is a new style Xen repository so building is dead easy